Merge from emacs-24; up to r108065
authorChong Yidong <cyd@gnu.org>
Fri, 6 Jul 2012 04:33:03 +0000 (12:33 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 6 Jul 2012 04:33:03 +0000 (12:33 +0800)

Trivial merge